From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 6 Apr 2012 18:03:51 +0000 (-0400)
Subject: extensionSystem: Make it a non-fatal error to re-load an extension
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6687
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b095319a1645f80f30f7f7744314194b7454f33c;p=gnome-shell.git

extensionSystem: Make it a non-fatal error to re-load an extension

https://bugzilla.gnome.org/show_bug.cgi?id=673613
---

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index fb811c2fb..f9ba89d6f 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -249,7 +249,8 @@ function loadExtension(dir, type, enabled) {
     let extension;
 
     if (ExtensionUtils.extensions[uuid] != undefined) {
-        throw new Error('extension already loaded');
+        global.logError('Extension "%s" is already loaded'.format(uuid));
+        return;
     }
 
     try {